meson: libgdk-broadway.a depends on broadwayjs.h

Fixes https://gitlab.gnome.org/GNOME/gtk/issues/1218

Also fix another dependency error I found.

diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build
index 0306770f3fa6c3d874a056a324d7981a3360119f..590440ace0259bf070630609716670d07a96e990 100644 (file)
--- a/gdk/broadway/meson.build
+++ b/gdk/broadway/meson.build
@@ -43,8 +43,19 @@ clienthtml_h = custom_target('clienthtml.h',
   ],
 )
 
+broadwayjs_h = custom_target('broadwayjs.h',
+  input : ['broadway.js'],
+  output : 'broadwayjs.h',
+  command : [
+    gen_c_array,
+    '--array-name=broadway_js',
+    '--output=@OUTPUT@',
+    '@INPUT0@',
+  ],
+)
+
 libgdk_broadway = static_library('gdk-broadway',
-  clienthtml_h,
+  clienthtml_h, broadwayjs_h,
   gdk_broadway_sources, gdkconfig, gdkenum_h,
   include_directories: [confinc, gdkinc],
   c_args: [
@@ -58,17 +69,6 @@ libgdk_broadway = static_library('gdk-broadway',
 
 broadwayd_syslib = os_win32 ? find_library('ws2_32') : shmlib
 
-broadwayjs_h = custom_target('broadwayjs.h',
-  input : ['broadway.js'],
-  output : 'broadwayjs.h',
-  command : [
-    gen_c_array,
-    '--array-name=broadway_js',
-    '--output=@OUTPUT@',
-    '@INPUT0@',
-  ],
-)
-
 executable('gtk4-broadwayd',
   clienthtml_h, broadwayjs_h,
   'broadwayd.c', 'broadway-server.c', 'broadway-output.c',

diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
index 33e61c114a7cdb6807da032e1f155e0df1455e20..03d314feefa8ef70af80648a62155eee21fdbec6 100644 (file)
--- a/gdk/x11/meson.build
+++ b/gdk/x11/meson.build
@@ -70,7 +70,7 @@ gdk_x11_deps = [
   xinerama_dep,
 ]
 
-libgdk_x11 = static_library('gdk-x11',
+libgdk_x11 = static_library('gdk-x11', gdkmarshal_h,
                             gdk_x11_sources, gdkconfig, gdkenum_h,
                             include_directories: [ confinc, gdkinc, ],
                             c_args: [